Remove two useless lines. (#142479, Morten Welinder)

	* gtk/gtkhruler.c (gtk_hruler_draw_ticks): Remove two useless
	lines.  (#142479, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index acc6727ac5b048d929643c4dbb65904ea1b0f4ba..e50ea1f57e3a8845dda7f7b5a880da3f1366e691 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun May 16 23:11:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merged from 2.4:
+       
+       * gtk/gtkhruler.c (gtk_hruler_draw_ticks): Remove two useless 
+       lines.  (#142479, Morten Welinder)
+
 Sun May 16 22:27:17 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkintl.h (Q_): Add a Q_() macro. 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index acc6727ac5b048d929643c4dbb65904ea1b0f4ba..e50ea1f57e3a8845dda7f7b5a880da3f1366e691 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun May 16 23:11:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merged from 2.4:
+       
+       * gtk/gtkhruler.c (gtk_hruler_draw_ticks): Remove two useless 
+       lines.  (#142479, Morten Welinder)
+
 Sun May 16 22:27:17 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkintl.h (Q_): Add a Q_() macro. 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index acc6727ac5b048d929643c4dbb65904ea1b0f4ba..e50ea1f57e3a8845dda7f7b5a880da3f1366e691 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun May 16 23:11:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merged from 2.4:
+       
+       * gtk/gtkhruler.c (gtk_hruler_draw_ticks): Remove two useless 
+       lines.  (#142479, Morten Welinder)
+
 Sun May 16 22:27:17 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkintl.h (Q_): Add a Q_() macro. 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index acc6727ac5b048d929643c4dbb65904ea1b0f4ba..e50ea1f57e3a8845dda7f7b5a880da3f1366e691 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun May 16 23:11:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merged from 2.4:
+       
+       * gtk/gtkhruler.c (gtk_hruler_draw_ticks): Remove two useless 
+       lines.  (#142479, Morten Welinder)
+
 Sun May 16 22:27:17 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkintl.h (Q_): Add a Q_() macro. 

diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c
index f91a1bad8218cdb0496ccbed2cd5263c66b5a308..07d549e8bfd03f6b626c5f4ea50959b50ab533a7 100644 (file)
--- a/gtk/gtkhruler.c
+++ b/gtk/gtkhruler.c
@@ -164,13 +164,10 @@ gtk_hruler_draw_ticks (GtkRuler *ruler)
   xthickness = widget->style->xthickness;
   ythickness = widget->style->ythickness;
 
-  digit_height = PANGO_PIXELS (ink_rect.height) + 2;
-  digit_offset = ink_rect.y;
-
   layout = gtk_widget_create_pango_layout (widget, "012456789");
   pango_layout_get_extents (layout, &ink_rect, &logical_rect);
   
-  digit_height = PANGO_PIXELS (ink_rect.height) + 1;
+  digit_height = PANGO_PIXELS (ink_rect.height) + 2;
   digit_offset = ink_rect.y;
 
   width = widget->allocation.width;